Deprecate functions according to deprecated GtkButton signals

https://bugzilla.gnome.org/show_bug.cgi?id=599218

diff --git a/docs/reference/gtk/tmpl/gtkbutton.sgml b/docs/reference/gtk/tmpl/gtkbutton.sgml
index 669cea113955708c6608465e8c1a194ef907fd73..c29bd26ea42ba776c36534c6e6e26ac3520be8e1 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkbutton.sgml
+++ b/docs/reference/gtk/tmpl/gtkbutton.sgml
@@ -195,6 +195,7 @@ Emits a #GtkButton::pressed signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::button-press-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_released ##### -->
@@ -203,6 +204,7 @@ Emits a #GtkButton::released signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::button-release-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_clicked ##### -->
@@ -213,12 +215,14 @@ Emits a #GtkButton::clicked signal to the given #GtkButton.
 @button: The #GtkButton you want to send the signal to.
 
 
+
 <!-- ##### FUNCTION gtk_button_enter ##### -->
 <para>
 Emits a #GtkButton::enter signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::enter-notify-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_leave ##### -->
@@ -227,6 +231,7 @@ Emits a #GtkButton::leave signal to the given #GtkButton.
 </para>
 
 @button: The #GtkButton you want to send the signal to.
+@Deprecated: 2.20: Use the #GtkWidget::leave-notify-event signal.
 
 
 <!-- ##### FUNCTION gtk_button_set_relief ##### -->

diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols
index 8f19b5d5e466b180dda2ec5c2ee8350cf67f43c6..4b39bded3623c7c6c8cbdd70b4ea25410b8bac06 100644 (file)
--- a/gtk/gtk.symbols
+++ b/gtk/gtk.symbols
@@ -541,7 +541,9 @@ gtk_button_box_set_layout
 #if IN_HEADER(__GTK_BUTTON_H__)
 #if IN_FILE(__GTK_BUTTON_C__)
 gtk_button_clicked
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_button_enter
+#endif
 gtk_button_get_alignment
 gtk_button_get_focus_on_click
 gtk_button_get_image
@@ -551,13 +553,17 @@ gtk_button_get_relief
 gtk_button_get_type G_GNUC_CONST
 gtk_button_get_use_stock
 gtk_button_get_use_underline
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_button_leave
+#endif
 gtk_button_new
 gtk_button_new_from_stock
 gtk_button_new_with_label
 gtk_button_new_with_mnemonic
+#ifndef GTK_DISABLE_DEPRECATED
 gtk_button_pressed
 gtk_button_released
+#endif
 gtk_button_set_alignment
 gtk_button_set_focus_on_click
 gtk_button_set_image

diff --git a/gtk/gtkbutton.h b/gtk/gtkbutton.h
index 1243e2abb56fd5ffad22ac949922c81971db08d5..7a67ddcf91161476f08927f08117e9d56419df69 100644 (file)
--- a/gtk/gtkbutton.h
+++ b/gtk/gtkbutton.h
@@ -93,11 +93,15 @@ GtkWidget*     gtk_button_new               (void);
 GtkWidget*     gtk_button_new_with_label    (const gchar    *label);
 GtkWidget*     gtk_button_new_from_stock    (const gchar    *stock_id);
 GtkWidget*     gtk_button_new_with_mnemonic (const gchar    *label);
+#ifndef GTK_DISABLE_DEPRECATED
 void           gtk_button_pressed           (GtkButton      *button);
 void           gtk_button_released          (GtkButton      *button);
+#endif
 void           gtk_button_clicked           (GtkButton      *button);
+#ifndef GTK_DISABLE_DEPRECATED
 void           gtk_button_enter             (GtkButton      *button);
 void           gtk_button_leave             (GtkButton      *button);
+#endif
 
 void                  gtk_button_set_relief         (GtkButton      *button,
                                                     GtkReliefStyle  newstyle);